intel-iommu: Add Kconfig option to exclude iGPU by default

There is still laptop firmware that touches the integrated GPU behind
the operating system's back, and doesn't say so in the RMRR table.
Enabling the IOMMU for all devices causes breakage.

Replace CONFIG_INTEL_IOMMU_DEFAULT_ON with a 3-way choice
corresponding to "on", "off", and "on,intgpu_off".

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Gbp-Pq: Topic features/x86
Gbp-Pq: Name intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index e15cdcd8cb3c8c64597707aa54398444f6a1ac4c..01d24bab76aa3518d482695ceda8c3bfc25aeb68 100644 (file)
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -212,14 +212,28 @@ config INTEL_IOMMU_SVM
          to access DMA resources through process address space by
          means of a Process Address Space ID (PASID).
 
-config INTEL_IOMMU_DEFAULT_ON
-       def_bool y
-       prompt "Enable Intel DMA Remapping Devices by default"
-       depends on INTEL_IOMMU
+if INTEL_IOMMU
+
+choice
+       prompt "Default state of Intel DMA Remapping Devices"
+       default INTEL_IOMMU_DEFAULT_ON
        help
-         Selecting this option will enable a DMAR device at boot time if
-         one is found. If this option is not selected, DMAR support can
-         be enabled by passing intel_iommu=on to the kernel.
+         Choose whether Intel DMA Remapping Devices should be enabled
+         by default. This can be overridden at boot time using the
+         intel_iommu= kernel parameter.
+
+config INTEL_IOMMU_DEFAULT_ON
+       bool "Enable"
+
+config INTEL_IOMMU_DEFAULT_ON_INTGPU_OFF
+       bool "Enable, excluding integrated GPU"
+
+config INTEL_IOMMU_DEFAULT_OFF
+       bool "Disable"
+
+endchoice
+
+endif
 
 config INTEL_IOMMU_BROKEN_GFX_WA
        bool "Workaround broken graphics drivers (going away soon)"

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 61da86bc2e10f3fe384eee728a25481ef2570ac2..7796f4a6cc1955787edf30f7d192a469ccb5cf86 100644 (file)
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -350,18 +350,14 @@ static bool device_is_rmrr_locked(struct device *dev);
 static int intel_iommu_attach_device(struct iommu_domain *domain,
                                     struct device *dev);
 
-#ifdef CONFIG_INTEL_IOMMU_DEFAULT_ON
-int dmar_disabled = 0;
-#else
-int dmar_disabled = 1;
-#endif /*CONFIG_INTEL_IOMMU_DEFAULT_ON*/
+int dmar_disabled = IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_OFF);
 
 int intel_iommu_sm;
 int intel_iommu_enabled = 0;
 EXPORT_SYMBOL_GPL(intel_iommu_enabled);
 
 static int dmar_map_gfx = 1;
-static int dmar_map_intgpu = 1;
+static int dmar_map_intgpu = IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON);
 static int dmar_forcedac;
 static int intel_iommu_strict;
 static int intel_iommu_superpage = 1;
@@ -438,6 +434,7 @@ static int __init intel_iommu_setup(char *str)
        while (*str) {
                if (!strncmp(str, "on", 2)) {
                        dmar_disabled = 0;
+                       dmar_map_intgpu = 1;
                        pr_info("IOMMU enabled\n");
                } else if (!strncmp(str, "off", 3)) {
                        dmar_disabled = 1;